Open
Conversation
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
* develop: Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
compatibility with Django1.6
* jmichelsen-master: added visitor to admin interface to capture IPs for banning added visitor to admin interface to capture IPs for banning
* commoncode-master: hardcode tracking version settings.AUTH_USER_MODEL
… into madteckhead-master * 'master' of https://github.com/madteckhead/django-tracking: listeners depends on Django which isn't installed for in fres environment
* madteckhead-master: listeners depends on Django which isn't installed for in fres environment
* MontmereLimited-master: HAS_GEOIP doesn't seem to exist anymore don't need this import gitignore
* stewiegaribaldi-master: Update urls.py Fixed TypeError: can't compare offset-naive and offset-aware datetimes Fixed Django 1.6 error: cannot import name HAS_GEOIP
* ramusus-master: merged with 0.4.1 version from bitbucket
* pythonhacker-master: version.py for versioning Fixing tracking pkg dependency error Fixing the issue with timezone aware timestamps
* pcraston-master: update changes Make compatible with latest Django Port compatibility fix for Django 1.5 Make compatible with Django 1.6
* bkeating-master: Removed rogue character ``IPAddressField`` is now ``GenericIPAddressField`` ``get_query_set`` is now ``get_queryset`` packet name change version bump pip install update rollback & safe point added missing import added catch Integrity exception added
|
thanks! worked great for me in 1.9 |
Author
|
if everything works fin may be good idea to merge and close pull request? |
Author
|
could you merge my changes? |
Author
|
have new IPv^ fix, is it possible to merge? @detimirikajidedo |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.